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

Change-Id: Ib360b46f5094d9c19769aacb8e193a2bfcf750ce