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

Bug: 236760014
Merged-In: I6844a141739f93154d10debc29c7565f92349d25
Change-Id: I9e50a9e46d764e98862bc1b9f4d127040a34cde4