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

Bug: 226662282
Merged-In: I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6
Change-Id: I4df938df7886adc58185586190e27bcd16e17966