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

Bug: 236760014
Merged-In: Ia14b0bc3851f3acbf7f38b3a0b5a4b0f89978f5e
Change-Id: Ia4a93ed19335c1479b5daee4ce1a3f9e79d9cecf