Merge "Add derive macros to KeyDescriptor" am: ca543112cd

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

Change-Id: I370905a3054e07f9e408f5d133ba5009703dab07