am b865d578: Merge "Opt-in Settings package to see restricted accounts" into jb-mr2-dev

* commit 'b865d578158150a13ca080c2525091a7722e75e3':
  Opt-in Settings package to see restricted accounts