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

Bug: 236760014
Merged-In: I14f950e4101027d1a6596fd1c459c4c4440b8379
Change-Id: I6bcc86898be9ef3daf6fd4cfa6a86b162ba0b9da