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

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

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



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