Android 12.1.0 Release 7 (SQ3A.220605.009.A1)
Merge cherrypicks of [18356502, 18600398] into sparse-8563200-L88600000954787219.

Change-Id: I1f940d0b09fbebfa8bd08848da28aaa0b62d4108