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 am: a4ef62b859 am: 27f9c82730
am: cb69c31db8

Change-Id: I5d3be52f6a7fd507072fbe4f4bad07c2714ad9da