Fix Sync preferred apn and preferred apn set id am: c9d38985 am: ce531e5a

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



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