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

Change-Id: I6b8be55f4d748f243cb8aeddfb63d9b1740ee0ad