[automerger skipped] Merge "TelephonyProvider returns preferred apn set" am: 84d6c3ae7a am: b41e1a31bc  -s ours
am: 34cca1c869  -s ours

Change-Id: I943fd8bdd5df733dee1ef5c09d8e16f88b45a92a