Merge cherrypicks of ['googleplex-android-review.googlesource.com/27148929'] into security-aosp-sc-v2-release.

Change-Id: Ida062b2c4cd0e0e72d2b2643b1fc88a7e97e7095