am baffc889: Merge "Lockdown \'remove user\' with user restriction in Settings for phones." into lmp-dev

* commit 'baffc8892440bcdf43c90aa74e301bd3d16a795a':
  Lockdown 'remove user' with user restriction in Settings for phones.