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

Bug: 236760014
Merged-In: I230be7dd8d657679c2b33c6324f3b525a98d1e2d
Change-Id: I01e0334dd104b9e64c72981dd5e846b9ae5cc0d1