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

Merged-In: Ie59b0bd34222bb901f93dc67061cde0d919f3a24
Merged-In: I986470145ccd513d23635bc5546ca0d43a66159b
Change-Id: I8fbfe30652788549ac9ce87d7ecaf47ba767322d