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

Bug: 236760014
Merged-In: I972a9b84667c8527209c8983f454d8511acc004e
Change-Id: Id950ac09d7f577588c2119e511153465e3516f16