Merge "Remove dependencies on the 1-variant fallback" into main am: 07e913e8 am: 03204988

Original change: https://android-review.googlesource.com/c/platform/system/core/+/3317641



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