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

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

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