DO NOT MERGE ServiceManager: Restore basic uid check am: eb304f0a36  -s ours am: a82f82293a
am: 1c220583e4

Change-Id: Ie1ab626a476ecada3ed5171489dc3fec0cf5a1f5