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

Bug: 236760014
Merged-In: I5dae8be1c7f9852e950c5d004473ad180b3c2c36
Change-Id: I5e89e094335fc5730f7e92b8551cf8e32b26324f