Merge "Extend attestation key expiration buffer to 12 hours" am: b075b8e4a1

Original change: https://android-review.googlesource.com/c/platform/system/security/+/2147406

Change-Id: Ieeeabab95f50b47ce607dadeae5982833d7d3613
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>