Revert "Sync preferred apn and preferred apn set id" am: 81009d66 am: e9292e0c am: 856cbbde

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



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