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

Bug: 236760014
Merged-In: I2796bc076b3f326aa1af55b2e82e09246087ece1
Change-Id: I9bcb3a40bcb60cfb4b4cda59129235f14813134f