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

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

Change-Id: Ic0aaef95b8a9dd09161ed346982c8b3947418f96