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

Bug: 236760014
Merged-In: Iadda123f01cd79663ae08c43e9d784a1a5e6c406
Change-Id: Ib36b3cf8a140836286f244726943956c2f285e02