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

Bug: 214455710
Merged-In: Id3fda53f4dd17ad9029a6d8d487ad9a166f34513
Change-Id: If7d1114949bb2c3cb10b6e95faa29ea532449e0e