[automerger skipped] Merge "Subscription Manager public method clean up" am:...

[automerger skipped] Merge "Subscription Manager public method clean up" am: 569cbcba am: 02686710 am: 810179a4 am: bb6d4e6b am: ec6d88ba -s ours

am skip reason: Merged-In Ibf8907efd9dfcae5155c1b7b85a1411b61a13a77 with SHA-1 fbba7fb3 is already in history

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



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