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

Change-Id: I81adc3019a7c9e0c66a19c62d04bc8a183147e8a