Merge "Used APN type instead of APN id" am: 2e371c1b5a
am: a916542011

Change-Id: I58bb518a7720e65edd73d93b5775fa4cc40b41db