Merge "RESTRICT AUTOMERGE: Fix HMAC Compare time attack" into tm-dev am: b3191a4a

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/21804206



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