Merge "Subscription Manager public method clean up" am: 569cbcbaa0 am: 026867107b am: 810179a46b am: bb6d4e6b4a

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

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