tree 6b78f6b5219344e4d730f42ed81c26da3a4d28d0
parent 90228682de97dc4c4a50bb9eaa3f4498d2d0dcb9
parent aa54ee3c23c6fe1b4c651d97aeca1376f5e935ec
author Jack Yu <jackyu@google.com> 1678404533 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1678404533 +0000

[automerger skipped] Added GetActiveSubscriptionInfo support am: df049d7a44 am: ae0936bad7 am: aa54ee3c23 -s ours

am skip reason: Merged-In Ibfbdd301162f25928e4fd26f976e5f17e2cfe24b with SHA-1 285100e092 is already in history

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

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