[automerger skipped] Merge "Fix Sync preferred apn and preferred apn set id"...

[automerger skipped] Merge "Fix Sync preferred apn and preferred apn set id" am: 8459a982 am: c3ec658f -s ours am: 14fe35cb -s ours am: c0d688a0 -s ours am: 2fd81469 -s ours

am skip reason: Merged-In I035bd604391ff2aa684ecca0355be9bc79248204 with SHA-1 c9d38985 is already in history

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



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