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

Bug: 214455710
Merged-In: Ife2ff971eaeda2b132658ca2704bf1edde6fd80a
Change-Id: Ic1617d8e3b1aac8c2acc2c483b1347431e911a1e