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

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

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

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



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