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

Bug: 236760014
Merged-In: Id845b8afe86bd9240ffa828f03e8dc3402890857
Change-Id: I6b99389f7eda3014de7078106656e5371907eeb1