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 am: c2607422

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



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