am 3f74023e: am 5b065655: am 48b13a58: am a7b4d6dc: Merge "Keymaster digest/padding NONE no longer means ANY." into mnc-dev

* commit '3f74023e028934c5a8d189c17f37009b95518374':
  Keymaster digest/padding NONE no longer means ANY.