Merge "RESTRICT AUTOMERGE: Fix HMAC Compare time attack" into tm-dev am: b3191a4aa7 am: 3ccc4ac693

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

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