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

Sync preferred apn and preferred apn set id am: d1f0d3d8 am: abd97c08 am: 123649e9 am: fe33724d

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



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