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

Bug: 236760014
Merged-In: I3197f4ad998e02b58e10dd2fda2ae480550a7134
Change-Id: I8059bdfd021c4aea61d0c041580980e6d9d547ae