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

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