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

Bug: 236760014
Merged-In: I9d7258383d68d5bd68e570a315eff9b7269e35f6
Change-Id: I6a9cecec1ef9ddfb45fbb3f2e9c98870861c1a72