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

Bug: 236760014
Merged-In: I224add0c407cc1745a3c44c5f09dfdbb59c44d45
Change-Id: Iedf17d383d7fb1fac14c191f95ea9174306d3f3b