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

Bug: 236760014
Merged-In: Ib692084b9fb4984d380963d2156546bbb91b4b0d
Change-Id: I0f1cce5e25e01844fe4436fe30a8edc2813492b0