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: Ic9458ad5b6856b354caef5804ecc9c52c0adb6b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>