DO NOT MERGE ServiceManager: Restore basic uid check am: 247ae46340 am: 171ab27931 am: 101c678909  -s ours
am: e55418a857

Change-Id: If0008ff56fb3348ac1bef2c77e99032bf6d51680