Android Security 12.0.0 Release 46 (9587746)
Merge cherrypicks of ['googleplex-android-review.googlesource.com/21224930', 'googleplex-android-review.googlesource.com/20659352'] into security-aosp-sc-release.

Change-Id: I2785b67855351e4908d5c7213aab36c57f6c01c4