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

Change-Id: I3caba2501e78c502ac32a5824b132db5f1bd3641