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

Change-Id: I1f4369f036c4146ffe39f30f1e60e15c48e3cd37