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

Bug: 236760014
Merged-In: Ie962b5ff821f166d79323474bc6fad66d930e8fa
Change-Id: If6a2b297523fde8d1556ccbca7f854a0398509d3