DO NOT MERGE ServiceManager: Restore basic uid check
am: eb304f0a36  -s ours

Change-Id: I6bae641d0ec80aaba79b716ef8bcd46279aca0ed