am f635a586: Merge "Disable verity metadata for eng builds"

* commit 'f635a586e8f4790455ef3dad8c1291c9eb95747e':
  Disable verity metadata for eng builds