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

Revert "Sync preferred apn and preferred apn set id" am: 81009d66 am: 64475838 am: 77c012a6 am: ae0dcae2

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



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