[automerger skipped] Merge "Add CarrierConfig key to customize apn priority" am: 04e78abfd4 am: 780f5638c2 -s ours

am skip reason: Change-Id Ib2139a93768999c2a867e40fea8d86c0ce730130 with SHA-1 14ad84249a is in history

Change-Id: Ie1d13bc46fd98fdd76f6e18016bf3f9bfd7ebb85