[automerger skipped] Merge "Add getSubscriptionId API" am: 7813c4a9a3 am: 5e84729b10 am: 98a648d4f2 -s ours am: 3e7889ce0d -s ours am: 75d984c200 -s ours
am skip reason: Merged-In I0a43d33daf523e6f0bea054c8965281bafbbcaa4 with SHA-1 f4982a080b is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2470383
Change-Id: I33bd994f0f6c78bf8054f5128b1d409e08b22126
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: