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

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

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



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