Merge "Subscription Manager public method clean up" am: 569cbcba am:...

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

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>