Merge "Change empty apn type in user entered APN to non-read-only types." into oc-dr1-dev