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