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

Bug: 236760014
Merged-In: Ib42d062101103f8c503681b56eb9e65cdf8b85c1
Change-Id: I0ce6eaf2b658aea3e90a8ba837df1c66e354dffd