ServiceManager: Restore basic uid check
am: 2b74d2c1d2

Change-Id: I27c3515350a64177f2e1de2599fe48eda7b3a739