am d0310dab: Merge "Persist user enable/disable setting through reboot." into mnc-dev

* commit 'd0310daba004cd8a5cda9688a1ef41c600f3277e':
  Persist user enable/disable setting through reboot.