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

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



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