Merge tm-dev-plus-aosp-without-vendor@8763363

Bug: 236760014
Merged-In: I320e8846d90e44b22ab5fe2a4afb69e711e38ba9
Change-Id: Ie880edf795b1575911aedc2414f69715c5a91840