[automerger skipped] Merge "Added flag to enable subscription manager service through adb" am: ff7abf38ad am: adfa26b36e am: 65f708eec7 -s ours am: 5f60d6c840 -s ours

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

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

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