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

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

Change-Id: Iaae86ff91e2faee4340a37ec34fd76798247f8d4