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

Merged-In: I8b23ec92656b37cb81bb74bfa6b70e6685b024a3
Merged-In: I2612141524cbd77334abaccb34cfa1659f5edfb6

Change-Id: I88e0607c608bdbc6429bcd97f228af663cc45aa8