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

Change-Id: I3cbea8b6234ac366ac99dc45f57b54e0ddba1a11