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

Change-Id: I0e550c834f988591d761a1830bee72e99be968f1