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

Bug: 214455710
Merged-In: I8d6aa6636beeca338ad1e30bcaf3e225484a315b
Change-Id: Iedf680eec5cc52617d70c78fda694e87f75c9a7b