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

Bug: 214455710
Merged-In: I8fdd7aa69407d7a4ece5cc018f741639507e1ed6
Change-Id: Ia083bd176996cc27325c9501054ee177abb22f4d