Android Security 12.0.0 Release 52 (10763434)
Merge cherrypicks of ['googleplex-android-review.googlesource.com/23914016'] into security-aosp-sc-release.

Change-Id: I47e19681c9ac7e5ebc5bb2facd9e52a356349804