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

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



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