Android 12.0.0 Release 33 (SP1A.210812.016.B2)
Merge cherrypicks of [15738806] into sparse-7698606-L38200000952402237.

Change-Id: I92ec428e2e67961853c6e7a6a1851df46c087e0f