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

Bug: 236760014
Merged-In: I61ac054c32525b8509baafd70840fbed0f1ab7c4
Change-Id: I4afc128626afd53768165344c07e64f55fc7dd87