Fix Sync preferred apn and preferred apn set id am: c9d38985 am: 51613ffb

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



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