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

Bug: 236760014
Merged-In: Id047eab50366273d99580d53433e25742e1f8516
Change-Id: Ia487d015d8550d3dfe44b5774071f98882bc448d