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: 4d7ce8de am: bd52f5ba

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



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