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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id81c6fe576c5d51c52813eac4f46612dc674e849