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: 277fd803 am: 4de88e1a

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



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