Merge "Turned on subscription manager service by default" into udc-dev am: 8af8ae50

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



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