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

Bug: 236760014
Merged-In: I9c3c79451cf7389408452e1d0838c82c22f6c8b7
Change-Id: I45610787701fc3964e713069c446f1577e0dcace