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

Bug: 214455710
Merged-In: I6443205361aaff30f2d03bb002535a7890afabb4
Change-Id: I398c8b43735fbec40e9e36ececd94295795bec7d