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

Bug: 236760014
Merged-In: I678beaf342a43b788c6b207b1659a081ce4e82d9
Change-Id: I566c99c9e9796abfee88dcb691ebae897ddf6970