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

Bug: 214455710
Merged-In: I823dd90fc4712676e1a497a98ffb98605d3f73e5
Change-Id: I96e0543efbc16731b1a14f77c7c314bb518e71e7