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

Change-Id: I57ee940525ec4c6fb8ee748deb8b2fb6e1033ca5