Merge "Revert "[Telephony]Unit test support for Apn Id removal at ApnSe...""...

Merge "Revert "[Telephony]Unit test support for Apn Id removal at ApnSe..."" into udc-dev am: 1d607f70

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



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