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

Merged-In: I5f7aab63d8e4570fe0e950258a537dc9d2e52943
Merged-In: Ibabc90bf50f19a5b786c294c55347eee8bff2551

Change-Id: I7f66772b16cd7a296adca7c34a2a47e1b7980ebd