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

Merged-In: Ie707d0f843e4d2a73bf36befe9d21825267ca101
Merged-In: I8208a85190c514f450ee932166e6e7fae07c6dcd

Change-Id: I01a0627c446136d162639c53ba8db24acff19a24