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

Change-Id: I50541ba686cafded699568f710627bf3e4f8aa1d