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

Bug: 214455710
Merged-In: I5d6fc80b5a829233f10430933a7f00ec4057a8a4
Change-Id: Ib3941feb7a070230ee39e374c0ffed8280b6d9c9