DO NOT MERGE ServiceManager: Restore basic uid check am: f03ba2c0d8
am: a9963dcfb7

Change-Id: Id42cd61ca837cc5e9da644feaae10f8f7d0e6c11