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

Change-Id: Ibe41eb3a2c9a0e28211d546b6b79469bb0523d01