[automerger skipped] Merge "Add getSubscriptionId API" am: e059f501 am: a33764a5 am: f73c86c7 -s ours am: 5099ad32 -s ours am: 87e13716 -s ours

am skip reason: Merged-In I67cb2bade2c9496a50cccd81fa8f6edc57ede967 with SHA-1 24839819 is already in history

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



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