Merge "Added flag to enable subscription manager service through adb" am: ff7abf38 am: adfa26b3

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



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