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

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