Merge "Add getSubscriptionId API" am: 7813c4a9a3

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2470383

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