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

Bug: 236760014
Merged-In: I6e004b0116d3aee491da553b178c33af0cba2ac6
Change-Id: I6938ac4281affc0f14e8640c88ff7b4550a5021c