Fix MSIM Network Settings (2/2)

For proper testing, re-enable disabler between reboots and toggle of
persist.radio.multisim.config value.

command: adb shell pm enable com.android.phone/.MSimActivityDisabler

Change-Id: I3f6b965340064d2446fb43b0817fb5e8b12d7c0b
Merge branch 'cm' into HEAD