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

Bug: 214455710
Merged-In: Ib07dfe90802f049233f1cc1a6185f4a7de650346
Change-Id: I12eec8d7027f6b175826017e35b0d4b9375ea195