Merge "TelephonyProvider returns preferred apn set" into pi-dev