Merge "hwcrypto: Add protectionIDs to keys" into main