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

Merged-In: I7cffe34a393991c4ef98740f7c3a052c0b6344fb
Merged-In: Ie0b7151fabd09f58d58745a3f9e2e0252e04411a
Change-Id: Id75747f4a2519f9fa1c7850f99f0298a39dbc79e