Android Security 12.0.0 Release 54 (10993239)
Merge cherrypicks of [17008939] into security-aosp-sc-release.

Change-Id: Ie0367fceab3da451a11e4aba414a608e83c2e20e