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

Bug: 236760014
Merged-In: I7f8f09bb55b66c0bf29cc901cb3b6d6a254bcefd
Change-Id: If4385a2f3b50c8eab42bc7779f0c91273c93ee2b