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

Bug: 214455710
Merged-In: Iec90538bf8dd18fede035d7f548a71b757d2356c
Change-Id: Icfcc0dcab0a30472a6faff67e67e364386b98d41