Merge "Fix unused exception throws in EncryptedContactStore"