Merge "Clarifying the KM challenge size" into main am: b8fe0e98bd am: f18c3a5043

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2812463

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