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

Change-Id: I0f4b3cc39998ecf869df8a2665da43e70c777f91