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

Merged-In: Id52362568105741b718f5096d80fe32c6d77de44
Merged-In: I91f98760f0ed7ba067ae32d3ea13c20b04c36f65

Change-Id: Ie80b480f7ad03be487ddb8df888525c9156f2528