Merge "cm: apns-conf.xml: (eHRPD/LTE handoff) Change pdp type for default APNs" into mr1-staging