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

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

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



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