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

Bug: 236760014
Merged-In: I3c0c00226458011bddaf560fac1ae31030fae9c0
Change-Id: I010580b70e243b3577be6506aef845bd1c6ad21a