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

Bug: 214455710
Merged-In: I99947e7fc58b5f6ab7d75f2af63b6bf9384917c3
Change-Id: I2a497f8cd91f0a67b10d35ecfb51becebedb7311