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

Bug: 236760014
Merged-In: Ied32aed9ae0948c40cd3daf6bb70b4fdeebdd7f8
Change-Id: Id06c93db6431fa0cab5f6cdcaa2a4c8123f76209