[automerger skipped] Migrated unit test to the new subscription manager am:...

[automerger skipped] Migrated unit test to the new subscription manager am: c2c8f45c am: f20c511d -s ours am: 35b7d9ce -s ours am: d97ee285 -s ours am: 585fc624 -s ours

am skip reason: Merged-In I355103117c0ad00bb6c6192c3f4c6585fbaf10a8 with SHA-1 6931c9eb is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/2681498



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