am ae4e45e2: am 4b8b88db: Merge "Use apn id which contains default type when...
am ae4e45e2: am 4b8b88db: Merge "Use apn id which contains default type when merging apns" into mnc-dev
* commit 'ae4e45e2':
Use apn id which contains default type when merging apns