Merge "Include verified boot hash in attestation"
am: 74924dc216

Change-Id: I2c10d3fac73c8ffd583ecc26508910391c29879b