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

Bug: 236760014
Merged-In: I2099bcd5554aed68b36fad1b866541fa441d210a
Change-Id: I1fcecc3ed027e4d8abaddb198b08a3b5b0898487