[automerger skipped] Merge "Added flag to enable subscription manager service...

[automerger skipped] Merge "Added flag to enable subscription manager service through adb" am: ff7abf38 am: adfa26b3 am: 65f708ee -s ours

am skip reason: Merged-In Ib3b18b9a052de4d9f78e432f42b83d099f1b42a2 with SHA-1 4967f98b is already in history

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



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