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

Change-Id: I9ac9efe65b6985fc7bd4e7be8a37e471023bd450