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

Change-Id: Ibbb0bb58324c2739779bef9df43db2d4992aa140