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

Bug: 214455710
Merged-In: Ib8c8e4ff1e6b7353529476ccb89827cb97bf8891
Change-Id: I8c9cd1486a5fe25cc22f077c5ad39070f6ed6ace