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

Change-Id: Id47da8dabd2c51ff65ec6a035e8ca21854913c9f