tree 35b3d54fa24e21b2878e9bcf32f586f47d113ea4
parent 09699b7e277af7e6ba48299b2e948d4713c5e208
parent 0fdf80ab509f8bf783c5be669cdde32d3eef4154
author Treehugger Robot <treehugger-gerrit@google.com> 1678217350 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1678217350 +0000

[automerger skipped] Merge "Add getSubscriptionId API" am: e9da3a19a1 am: 1b1f77b0b3 am: 99f457fede -s ours am: 0fdf80ab50 -s ours

am skip reason: Merged-In I7e1e44509169b11024455d52749531f021ab7383 with SHA-1 00ece8c52d is already in history

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

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