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

Bug: 236760014
Merged-In: I4d0d98f91bbcc7bb4b9f1d85e05524e72f0d8d9d
Change-Id: Ie8ec9016442faeee5174bb684166354ed98c0d40