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

Merged-In: I271b29b9c2aaa58c15138d8ce12bcd04e449ff1e
Merged-In: Ib19302466239df51861a907060bba430f79ae6bf

Change-Id: I08a965ef99f3e19f0b774e6bee773a3b08a28d96