ServiceManager: Restore basic uid check am: 5fa90a063f am: 362687f1f4  -s ours am: 7050b0c54d
am: e418592b47

Change-Id: Ibf72b607031e48aa5c0c8be6dd20249dc699f295