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

Bug: 236760014
Merged-In: I38bdd80060cb6062b9f1f8822df70b394a7d9744
Change-Id: Id73cb10f27e09a939e913aed79593d32cc713130