Merge "Revert "Keystore SPI: Initialize KeymasterDefs contants with AIDL generated enums"" am: 9233cb2be8

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1512878

Change-Id: I69cb45b74d3bd39a9aa14f785a0655f6abfe9402