Merge "Fix for the documentation in TimeStampToken.aidl. HMAC computation will always use 1, which is the value of SecurityLevel.TRUSTED_ENVIRONMENT. This is done for backwards compatibility purpose. Test: N/A Bug: None." am: 006bdf3fa9

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1717931

Change-Id: I25112411c12a7715a6403d3b40cad6c161ac7ef9