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

Bug: 214455710
Merged-In: Id6910c32875b82e44020f6138e8e89b6a8bff4a4
Change-Id: Icf8b8bbc64061583979754b599c08f3d2ecfb581