Merge TP1A.221105.002 to aosp-master - DO NOT MERGE

Merged-In: I823c57b06078ae8d322e950e556d4cb47b83e62d
Merged-In: Id64ba7cca9959b2f97b54e67b81f59f54c2f6e48
Merged-In: Id64ba7cca9959b2f97b54e67b81f59f54c2f6e48

Change-Id: Ibab00dcf72adadd358e58d2bd484fca06062159d