Fix crash in network mode settings

Change-Id: Ia3bec57cab559ebc55fa704d4aae7bb00576c65c
telephony-msim: Fix package errors

 * Move this stuff to the correct directory.

Change-Id: Icc91c0a7620857ef5b00c570ce42608f93d54dda
Merge remote-tracking branch 'cyanogen/cm-11.0' into cm-11.0