Fix the APN editor fix

The APN creator puts its data in a Bundle, not an Intent. Get the
operator identification argument from the right place to avoid
attempts at creating networkless APNs

Change-Id: I42b6e00fffdeea4ea538d55687cdbb4d2d548127
Merge "Fix the APN editor fix" into cm-11.0
Merge branch 'upstream/cm-11.0'