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

Merged-In: I2f2ea1b229489b5aed597442c4a90295837f8204
Merged-In: Iae84a2b7fb67498a5e5b5a7c27660adb7cbe9398

Change-Id: Iaee691fcff9724c1f11653751a3689b6f094b7db