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

Bug: 236760014
Merged-In: I46bf3f037d801f9fa1e724a102d3b3f4f71b6202
Change-Id: I02e1d9dc617834edb53555e2ac0b327065cc1c2d