Merge "More CTS tests for Android Keystore HMACs." into mnc-dev