Merge "Keyguard: Use the phoneId to map the service state"