Merge cherrypicks of ['googleplex-android-review.googlesource.com/30465588', 'googleplex-android-review.googlesource.com/30489439'] into security-aosp-sc-release. Change-Id: I4123ccb100c09bfd4b5e6f39bbb3dd966bcf92fd