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

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

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