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

Bug: 236760014
Merged-In: Ib0223f833e3842240bb801013f99963b6c44b48a
Change-Id: I1232ec8bb4c4a52c859a2ae6917f4f6fdea40756