Merge "RKP spec: fix public key info description" am: bf0ae8a0f0 am: fd313e8f72

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2430758

Change-Id: Iba1dd45c411bc7bca9821a0e5d4d1988245504a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>