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

Bug: 214455710
Merged-In: Icf9126f27d81486847d07224a49f92c19e4a49d5
Change-Id: I81aa5aaf63205d8725225a5af037d59c7992ac67