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

[automerger skipped] Merge "Added remove subscription support" am: cf6bf85d am: aa00e172 am: 9fb7585e -s ours am: e3298b08 -s ours

am skip reason: Merged-In I13b6940e34945aeb77d4367724cd10ed6a3fc005 with SHA-1 647bbb99 is already in history

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



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