Merge "Clang-format android_keymaster_messages.cpp" am: a5308280ba am: 137f647ebe

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia4f6220013d1734ccb5d8a4e2bbfc926db7bda91