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: 27b1d791 am: 9c682017

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



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