Merge "Add getSubscriptionId API" am: e059f501e8 am: a33764a570

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

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