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

Bug: 236760014
Merged-In: Iffdeb8510c52764423166b5dc7168c7438260257
Change-Id: I1fe080db59b3498aed385a390b43700859df69aa