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

Bug: 236760014
Merged-In: I2481285c598c04be8b448c88da98756daa8a19d0
Change-Id: I4ac500e779554dbf05a0eaf75e7007742667fbd1