ServiceManager: Restore basic uid check am: 2b74d2c1d2 am: 8039d6e068
am: 528544025c

Change-Id: I9dd1a4d36ff39f9de77c6c33e8cd36268f77c30b