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

Merged-In: I6dd163d7b5e5be00be3aaa57a13606e8105ccf9c
Merged-In: I5cdbca518b597c24b129e01325cb5089e187d377
Merged-In: I5cdbca518b597c24b129e01325cb5089e187d377

Change-Id: Ia5ff75da7298873531e66c511d91e7351ef8354b