Merge cherrypicks of ['googleplex-android-review.googlesource.com/28559214'] into security-aosp-tm-release.

Change-Id: Iadf494e580f38e58ae3657513e97bded81432b90