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

Bug: 236760014
Merged-In: I2c5864f2229b9e990e04875d22666cf831a9c234
Change-Id: I37443dadd8ce99513939e6f815e222aa932409fb