Merge "Merge "Increase leniency of attestation record timestamps" into qt-dev am: 6c4e33d079 am: 72c4746cda" into qt-r1-dev-plus-aosp
am: 040d53ab30

Change-Id: I3583c2e1f047d1bdae9d11d0e88f591509013259