DO NOT MERGE ServiceManager: Restore basic uid check am: f03ba2c0d8 am: a9963dcfb7 am: cac59eae3b am: 0c63d9490c  -s ours
am: cc453b9926

Change-Id: Ib6cd35f8e1fbabfeca37626854eba9c927b120ca