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

Merged-In: I6926e27050c030657eaf9b7ed51c024e7b8abb03
Merged-In: Ic32e2b7231c0668317b6a753fe87699fe4f0e0af
Change-Id: Ic76af62a7aa7f4fa90ab880a3813a8cf4a6c9dc8