Merge "Enable SC registry in the Shell" into udc-dev am: 23e27732 am: 5c35ee1c am: 0e4763ec

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



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