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

Bug: 236760014
Merged-In: I3d9dc14162402c7897688401183347b78ffd4e86
Change-Id: Iaf8475603f3c64a3fa5aea4eeb6a7892b05afe7a