Merge SQ1A.220105.002 to stage-aosp-master - DO NOT MERGE

Merged-In: I4c199ec81b3f30a3a12ae40af29185549387d34d
Change-Id: Iaad5a0650e1a87995c1e15c9e53f3025cd157b90