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

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3317680



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