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

Change-Id: I391e4cfd66924cbb709c78f44fb4d6819bbf133f