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

Bug: 236760014
Merged-In: Ib4b72e0a277d8b2fb78837bed5d2e9cccd819a07
Change-Id: I9d0e133b64c2d6afb795eb049c58bc2ff5ab79b5