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
am: 1864a8748d  -s ours

Change-Id: I2e022f5c528ded283a40ad3e3a4ac230070a242b