am 78014a78: am 04047af6: Merge "Use Keymaster-friendly validity dates."

* commit '78014a78155ad05ca2e0af600c0545377c04bdbd':
  Use Keymaster-friendly validity dates.