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

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

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



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