Revert "Sync preferred apn and preferred apn set id" am: 81009d66 am:...

Revert "Sync preferred apn and preferred apn set id" am: 81009d66 am: e9292e0c am: 6be3f281 am: 4ead8a43

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



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