Merge "Don't require UNKNOWN_ERROR" into main am: 606a406750 am: 6375a4ce87 am: 397045494b am: d802e0c06a

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2757927

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