Merge "Add getSubscriptionId API" am: e9da3a19a1 am: 1b1f77b0b3

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/2470130

Change-Id: I5a3ff6d8a92c2f081f40d9ec0ef4dd2be1741247
Signed-off-by: Automerger Merge Worker <[email protected]>