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

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