Merge "Fix minimum size description of challenge" am: ceeb357048 am: ca0abefa7e am: 0c1a79c5e4

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

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