Merge "TelephonyProvider returns preferred apn set" into pi-dev
am: 10ba9a8f8d

Change-Id: I0c428e907c644919153ed75cce05085ab42d9e50