ServiceManager: Restore basic uid check am: 5fa90a063f
am: 362687f1f4  -s ours

Change-Id: Id0b1cacaea12f53760ac8941a9bd321f8acee25f