DO NOT MERGE ServiceManager: Restore basic uid check am: 247ae46340 am: 171ab27931
am: 101c678909  -s ours

Change-Id: I3c98fc1516193caab37bcb9cf88ffe6104dd65b1