Sync preferred apn and preferred apn set id am: d1f0d3d8

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



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