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

Bug: 214455710
Merged-In: I1dc2af889985b79e2554c763f6489cab9932e143
Change-Id: If31a16ec475f5f0f08bcf0d603574410dae64656