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

[automerger skipped] Merge "Added flag to enable subscription manager service through adb" am: f4bf51c4 am: 28126048 am: 43887a8f -s ours am: ac029b36 -s ours am: 9d1922bc -s ours

am skip reason: Merged-In I14ff642402929bcfd39e6c20c50588ef8eec4eed with SHA-1 a2406140 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/2528304



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