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

Bug: 236760014
Merged-In: I17b0b3e8ef2eb0ce62c26a61ef26d1067a18edb6
Change-Id: Ie2e257ae14e0eb5d287f15d1db7c7f90485e6bd9