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

Change-Id: Ic7f7594709d41a9165849ce4ed1d0b794b793f87