Merge SQ3A.220705.003 to aosp-master - DO NOT MERGE

Merged-In: I56d88c25feb111b208454c596cfccc7d0c8bf9d3
Merged-In: If54710a96ca8e3ac5ff41897fbeb14144bfdb626
Change-Id: I44906998f027eadf96242d56587927cecd69ce6c