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

Bug: 214455710
Merged-In: I87e9fc4fd54e138b6c678e3d6d580a8e961733b9
Change-Id: I474c54f4117a6100b2c735f46a7a02b0b9c27e07