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

Merged-In: I4f6343abbe6d798b2b6633bde1df62d28686a7f2
Merged-In: I3d64037ad882761223302c8fd8c77ac04b6c5f8c
Merged-In: I3d64037ad882761223302c8fd8c77ac04b6c5f8c

Change-Id: I9e5c22511b7fada8b5def1ae8f0a87c971ec7f3a