Merge changes from topic "revert-1900930-version-bump-TMGXYBHYHZ"

* changes:
  Revert "Bump keystore2 AIDL API version 1->2"
  Revert "keystore2: cope with new curve25519 enum"