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

Bug: 236760014
Merged-In: I9299f6a604d0a0df70ecc6b9a030aff4fa00c153
Change-Id: I82e56fed16d6bdb7d7e110e0577e7f4a6e77e03f