Merge "Prioritize strength error over hardware error" into android15-tests-dev am: 4998bb62e2

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

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