Merge "Change empty apn type in user entered APN to non-read-only types." into...
Merge "Change empty apn type in user entered APN to non-read-only types." into oc-dr1-dev am: 4fffc20a
am: fb2b63df
Change-Id: I0c19439f83ff576673ab7ebf9b8e5860b7eb7dc3