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

Merged-In: I41f7a395539ac2ce3b08899b27cdc5d6031b175c
Merged-In: Ib4a07c7ce4e4be2844cc2f4a97094e73a517c7a4

Change-Id: Icd00f57019b2025216d6ee8b4529e42f44fd987d