Fix Sync preferred apn and preferred apn set id am: c9d38985 am: f929d5b1 am: 0efef343

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



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