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

Merged-In: I96d78a8ca5d806df1daffc5afb7dbb982d5989b6
Merged-In: Iadad208dfb05580a800f5c53fa12462b9fc5a0c2
Change-Id: Ic0a8b9a85d9904ed0cac7da056463aade5f80c2d