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

Bug: 236760014
Merged-In: If82a5bf302cb68a2c5b486006e4679fbfc8ee545
Change-Id: I9f63475a68f386bbb8ad768a8f2075e6c3c55eaa