Sync preferred apn and preferred apn set id am: d1f0d3d8 am: abd97c08

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



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