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

Bug: 236760014
Merged-In: Ide4d8b5e74c27da5b38d8ad7d3a2dc47409e5cd6
Change-Id: I1672dd739bb3f9169a83757a59f4bf3ee25c6a54