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