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

Bug: 236760014
Merged-In: I0d776f3fbdbba925cf1ac272270fb36f286dff91
Change-Id: Ic2243bf19ccf61691528426e625138adbe93140a