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

Bug: 236760014
Merged-In: I3d37fee446655b59b6b4837aaf9f8073d49d78db
Change-Id: I95a8356e410a03ff743ce614a094f1cdc36c123c