Merge "Merge sc-v2-dev-plus-aosp-without-vendor@8433047" into stage-aosp-master am: 4bf5985951 am: a3cc2e0bbd

Original change: undetermined

Change-Id: I563b91d0b624a6cc8ceded879a17dc7cdb846e0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>