Fix Quick Settings for MSim [2/2]

- Use active data sim for setDataEnabled/getDataEnabled
- Also update system setting  for setDataEnabled so that the correct
  state is displayed in Settings

Change-Id: I1c72d9955b1d068ef276386b761f7aa2d664fdc2
Merge remote-tracking branch 'cm/cm-12.0' into HEAD