Empty merge of sc-v2-dev-plus-aosp-without-vendor@8084891

Bug: 214455710
Merged-In: Iaa6b544dadc0de4691c465a34da148a1ab15f150
Change-Id: I7a1a3e62a2cb3f8e247bd78723b29f3fd654e6f6