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

Change-Id: I4a2dca71addd5a3a5f442688a8314e5702497329