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

Change-Id: I107ec23f410d6ee30603596e4bd4b93c93619791