Merge "Drop minimum RKP challenge size to 16 bytes" am: b2f7bf2a38 am: 9aa84ddadd am: 8a71d2af92

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

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