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

Bug: 236760014
Merged-In: I47c5e3d165a63b02cf60153d01ca5004c2722807
Change-Id: I06eeda3dde5f187db507b5bae0f75b385106b3cc