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

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

Change-Id: I56fe40e9d7face23381b364449e2549f44245c1e