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: Ie8be0fb9b943e5bc8b1046e8e3eb3384e52b223a