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

Bug: 236760014
Merged-In: I2b3f7e565684cc3ab14ee15fa28f763752c8ae36
Change-Id: I1ead855c3d222411ff0ffb3fdee02a2663711400