Adjust variants specs to match latest UX spec. am: 6a82afbb am: 4eb17f83...

Adjust variants specs to match latest UX spec. am: 6a82afbb am: 4eb17f83 am: 6e9e897e am: c94db7c0

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



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