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

Bug: 236760014
Merged-In: I93e20d1f691ec395c63422eb689e08dc5ea5652c
Change-Id: Ie059efc3e29002dda0d4c0e7c663989caa7e239a