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

Merged-In: If7977d5f84b425695bf9ce66f24786447df2290b
Merged-In: I651d0d53004b0171869b4e930273e3568a5ae6db
Change-Id: Ifecf793f481f890b5ad5751f6cd14eba9883542b