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

* commit '48b13a58bba59c548d835a2d646e1da6fad6473d':
  Keymaster digest/padding NONE no longer means ANY.