Merge sc-v2-dev-plus-aosp-without-vendor@8084891

Bug: 214455710
Merged-In: I40672a0745ac65549c539da73ebb5b1710fd2821
Change-Id: I5a4b1775eb06ead74d360332ef750fc2215378c7