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

Change-Id: I2d17ab94a66c5ee9b5aa7d0bd8a89e31f39d7b9d