* commit '1f4a1c5823e11dd48a0d076ab88f33a32aef478a': Handle apps that share a UID with the system_server correctly.