Merge "Adding check for HMAC/EC key size for StrongBox" am: ffee7d8ce0 am: f5992f894a
am: 717fca1d59

Change-Id: I15c12c940722bb6a810f86b039d9a3d2f0eadac4