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

Change-Id: I672617263a66261b36de2f3fb6c7829d39f87e51