ServiceManager: Restore basic uid check am: 2b74d2c1d2
am: 3f505a247e

Change-Id: Iae46cadfc90e7f8e13657978fab4e01cefb5b9ba