Merge cherrypicks of ['googleplex-android-review.googlesource.com/23583481'] into security-aosp-sc-v2-release. Change-Id: I0f709be5104fb936227c60da6c5c5102b39da642