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

Change-Id: If5210c25834538adb53c6f8b8310cfda18c3478e