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

Bug: 214455710
Merged-In: Ie76983423f81b6503d4f24f2d0ba62875593fd7c
Change-Id: I34cc2a97dba7e2fa249bd4e9a13eaa51256a5693