Merge "Keystore 2.0: Allow by key id usage of granted keys."