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

Bug: 226662282
Merged-In: I34050f4f12e36e671bddc3ffeb7fe17a8a19a929
Change-Id: Idfcfd64cf47aaf2cc2a06ae199b1085b54ee3652