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

Bug: 236760014
Merged-In: I77b937775fa774c700b9a080a92bbeb9d80f5d32
Change-Id: Iccfc5d2289de2094e64450266598dfb2ea2242df