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

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

Change-Id: I56672198a85e03c1b69f9c7df4a68107efa3c1ec