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

Bug: 236760014
Merged-In: Id0c69dbc5827202f834e0f6f1a9bf39395e8b597
Change-Id: I15d3251696f385b76bdc44c23cf0c544992651da