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

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

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