Merge "Subscription Manager public method clean up" am: 569cbcba am: 02686710 am: 810179a4

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



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