Merge "Make key names unique." am: f9fd5631b9

Original change: https://android-review.googlesource.com/c/platform/system/security/+/1659617

Change-Id: I75101ce4410090b4157ba10b854a92b6abb0edcd