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

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

Change-Id: I647e23d2cd1b4252211b49488c7bde189a3c195f
Signed-off-by: Automerger Merge Worker <[email protected]>