Android 12.0.0 Release 30 (SP1A.210812.016.B1)
Merge cherrypicks of [15723689, 16476806] into sparse-7698606-L38200000952402237.

Change-Id: I1afe2754eb145e3c7bc636d0a99fa0e4746d25c2