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

Bug: 236760014
Merged-In: I84ad65b397ac38f30f2a4a8ad8ba384fbb50abdb
Change-Id: I82b360c52e00ce960357c9525da960a4eeaf6b7e