Merge "Enable SC registry in the Shell" into udc-dev am: 23e27732 am: 20e857ba

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21647026



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