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

Merged-In: Idb4a38c1a7e263037d990ff16bbb65348ec11cf6
Merged-In: I7ff232089ae3726290c9f50ee286441ebc5d5cf3
Change-Id: I8ee9528f221167a736c51a7b5d3b5198410b9883