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

Bug: 236760014
Merged-In: I27123db04b1f6bc635ae2b5764719d9610c9f020
Change-Id: If896a27bf7824c9c3e586822a93b4d8122cb37fd