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
Fix merge taint in data_usage_cycle_editor

Change-Id: Ic607b31848f09c37dceb58876785aafaf8d405b4
Merge remote-tracking branch 'cm/cm-11.0' into HEAD