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

Bug: 214455710
Merged-In: I0bc25869eee8baef53664e16dedbeda7fa28a9a7
Change-Id: Ie880da1e597f31a0f0372b9f120a193469755944