DO NOT MERGE ServiceManager: Restore basic uid check am: 247ae46340
am: 171ab27931

Change-Id: I3cfc70e8fb1dd393a92ace283d36ee2b35585ea4