Merge "Use anonymous namespace for static functions." am: cb57f1e054 am: 878d2bd7ec

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia8768feb209bc01c126e4c552cd0030e4a55b338