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

Change-Id: Ib1d85df2219611befaeb35b919e24a715e34b405