am: 4ab36372fb * commit '4ab36372fb7f2f8236d9fa308ec508582fc52607': Clean up on UserManagerService and DPMS
4ab36372fb