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
am: f10b164b00

Change-Id: I13bcf7dc4fa7acf44156510f073065d7c0881052