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

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



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