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

Bug: 236760014
Merged-In: I9b5cd03266d4d1242b476e564331a02c6df04be4
Change-Id: I67decf1641072f1d705716d49c2594ce4b210f67