Merge "Enable SC registry in the Shell" into udc-dev am: 23e27732 am: 5c35ee1c am: b3a95f03 am: 1e14fa9f

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



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