Merge "Remove dependencies on the 1-variant fallback" into main am: 3f1eba32 am: ceb09124

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3317794



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