Merge "Revert "Revert "Keystore SPI: Initialize KeymasterDefs contants with AIDL generated enums"""