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: 2a95246b

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



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