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

Bug: 236760014
Merged-In: I9670bc63fb7d9e2c2091357f16bea27e8e3331bf
Change-Id: Ifc0039552914144aab36a524108680464cc9cc67