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

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



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