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

Bug: 236760014
Merged-In: Iafbff5e4e2b8ed40bd09645d605730338f014d8c
Change-Id: Iccc2768621dd0dcd98ac5887d186ae050dd0f5df