Merge "Increase leniency of attestation record timestamps" into qt-dev
am: 6c4e33d079

Change-Id: I345aaaeea6d26490d28d238f83e8d53410ccbd72