Merge "Keystore SPI: Initialize KeymasterDefs contants with AIDL generated enums" am: 136fcd2a56 am: 1a59bf1dc2 am: 6dd168558e

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

Change-Id: I919b08cd59919c32bc6f94d1c61c25c9a7931f57