Merge "Clang-format system/keymaster." am: c783fcc9c6 am: 106be1f768

Original change: https://android-review.googlesource.com/c/platform/system/keymaster/+/1530449

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I357b7adbf6784fa1d7eaca447992598d4847bd1d