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

Change-Id: If08d70dc5158339d0ef87f152c5f214927542fbe