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: 0869559543
am: 2b0a6558ac  -s ours

Change-Id: I14fac5817d5e1b45c8740b8821b39a77a89732f2