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

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



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