DO NOT MERGE ServiceManager: Restore basic uid check
am: 247ae46340

Change-Id: I67af781d5876b13daca82cb7e947397c94cd62e7