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

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



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