[automerger skipped] Merge "Revert "Added missing outlineVariant token from...

[automerger skipped] Merge "Revert "Added missing outlineVariant token from Material"" into udc-dev am: 27e18575 am: 1cfc39fd -s ours

am skip reason: Merged-In Ib84c97b8139c4042dfc06e34f32281483dba47db with SHA-1 da5ef257 is already in history. Merged-In was found from reverted change.

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

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



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