DO NOT MERGE ServiceManager: Restore basic uid check am: 247ae463 am: 171ab279 am: 101c6789 -s ours am: e55418a8 am: 419626b4 am: 12151706 Change-Id: I0e550c834f988591d761a1830bee72e99be968f1