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

Change-Id: I4d4c9c02274ca870ee799f9fed1ceb1fde11c3a5