DO NOT MERGE ServiceManager: Restore basic uid check am: eb304f0a36  -s ours am: a82f82293a am: 1c220583e4 am: ce472fbb54  -s ours am: e8cb9c8982 am: 1414d7b372
am: b8d937caeb

Change-Id: I82f6a95334c5c8e484260f120b54ac1d386274da