Remove dependencies on the 1-variant fallback am: 1f6af68c4a am: 1b882f1d8b

Original change: https://android-review.googlesource.com/c/platform/frameworks/layoutlib/+/3317665

Change-Id: I59ce3fcc0c40a7c2d76e330e92b7af4cae6c1e15
Signed-off-by: Automerger Merge Worker <[email protected]>