Merge "Add tests covering android.system.keystore2.IKeystoreOperation::abort API." into main