Merge TQ1A.230105.002 to aosp-master - DO NOT MERGE

Merged-In: I61e87e30f3e842e662ff631463cac5369f8e3e16
Merged-In: Iedf7786eed806f7fecadfa37ce2be97bec873cf4

Change-Id: Ibe4269720cab0f5e5a9af126bd680f5d07d13cb2