Merge "Remove dependencies on the 1-variant fallback" into main am: 583f5a523b am: fb7628b1a3 Original change: https://android-review.googlesource.com/c/platform/packages/modules/RemoteKeyProvisioning/+/3316889 Change-Id: I1b92364e2dc3e37c8ca6d14636b772f26cb7fdd2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>