Sync preferred apn and preferred apn set id am: d1f0d3d8 am: 3e1960d5 am:...

Sync preferred apn and preferred apn set id am: d1f0d3d8 am: 3e1960d5 am: fe8cee18 am: e6b9f396

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



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