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

Bug: 214455710
Merged-In: Idca80a9fbed2e304da50bd668ab7cb662d6e06a2
Change-Id: I50e66aec0482fa5b77cf4da0e115ae59d9dad212