Merge "Merge "Prioritize strength error over hardware error" into...

Merge "Merge "Prioritize strength error over hardware error" into android15-tests-dev am: 4998bb62" into main am: a592e668

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



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