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 am: 94131d871b am: 1607b3abb2 am: 5f008dd310

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

Change-Id: I751eac42a4642b1d8e7b3aa03eed885599b0877f