Merge "TelephonyProvider returns preferred apn set"
am: 84d6c3ae7a

Change-Id: I22465dd55952dbf72f3cc98b55b3c0a7b12b1b11