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