Merge "Handle apps that share a UID with the system_server correctly." into lmp-dev