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

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



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