am 51884f0e: am 499126c4: Merge "Add Keymaster KM_ORIGIN_UNKNOWN constant."

* commit '51884f0e066bcf1ba5e039cd8a24a87139b5a01c':
  Add Keymaster KM_ORIGIN_UNKNOWN constant.