Automatic translation import

Change-Id: I3697f008222cf84dcd29faeefd1a92c1baea81a7
Telephony: Disable MSISDNEditPreference until init complete.

  - Avoids NPE. BACON-1832

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