Merge "keystore: Change superclass of UserPresenceUnavailableException." into pi-dev