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

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

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