[automerger skipped] Merge "Merge "Merge "Prioritize strength error over...

[automerger skipped] Merge "Merge "Merge "Prioritize strength error over hardware error" into android15-tests-dev am: 4998bb62" into main am: a592e668" into aosp-main-future am: 88937a64 -s ours

am skip reason: Merged-In I911fc76d14837e277354cb4c0e2e56ee486fcfd9 with SHA-1 771f6d72 is already in history

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



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