DO NOT MERGE ServiceManager: Restore basic uid check am: 247ae46340 am: 171ab27931 am: 101c678909  -s ours am: e55418a857 am: 419626b496 am: 12151706b2 am: 899d956cf3  -s ours
am: 66818cfeae

Change-Id: Ide7a6b47d4a0027203741f12c8229ba3948cb3c0