Merge "RKPv2 spec clarifications" am: 85fb71b280 am: a6642987e9

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

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