Merge "Keystore SPI: Initialize KeymasterDefs contants with AIDL generated enums" am: 136fcd2a56

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

Change-Id: I1bc5f8464371205eb759ec4dec6ddb92406a98be