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

Change-Id: Ib91d630f70f4fa434915ac15938c7dca94fe3de5