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

Bug: 214455710
Merged-In: I10fd54544bee940313f3987247c1841101a9d03a
Change-Id: Iec868d5230dbcf81bb6f4af7cf3bc42d57d6b84d