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

Change-Id: Ide7eb8fe649d7d0aea4fa66362b0cb0a7709c4d0