[automerger skipped] Merge "Add getSubscriptionId API" am: 7813c4a9 am:...

[automerger skipped] Merge "Add getSubscriptionId API" am: 7813c4a9 am: 5e84729b am: 98a648d4 -s ours am: 3e7889ce -s ours

am skip reason: Merged-In I0a43d33daf523e6f0bea054c8965281bafbbcaa4 with SHA-1 f4982a08 is already in history

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



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