ServiceManager: Restore basic uid check
am: 2b74d2c1d2

Change-Id: I01ebfcff30a8b25e3d8435b96bd437fb6e41f8a5