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

Merged-In: I93ba6d21693175984da8de3aaccdcceea03318fe
Merged-In: If3ad9b294d7c8897288e118b599ac642f989e827
Merged-In: If3ad9b294d7c8897288e118b599ac642f989e827

Change-Id: I97dc8a3d9c69b3831db34a8e34101491c36bf983