Fix Sync preferred apn and preferred apn set id am: c9d38985 am: f929d5b1...

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

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



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