[automerger skipped] Merge "Added remove subscription support" am: 7a3d4427...

[automerger skipped] Merge "Added remove subscription support" am: 7a3d4427 am: eae3ba62 am: aa8e679c -s ours

am skip reason: Merged-In Ia19ea13132420278b50ddb6c0faba29d9ddacbf2 with SHA-1 5b20f5c6 is already in history

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



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