Merge "Remove dependencies on the 1-variant fallback" into main am: a0c2437ea5

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

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