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

Change-Id: Ifc639e74d4ea737ffad83a1ffd5f4216bb7c0ff1