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

Change-Id: I9445235baf1ea98e3e47af3034fa49b0593ae1b2