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

[automerger skipped] Merge "Added missing outlineVariant token from Material" into udc-dev am: 78e34cb1 -s ours am: 7d2b30ab -s ours

am skip reason: Merged-In Ib84c97b8139c4042dfc06e34f32281483dba47db with SHA-1 2c2a70f7 is already in history

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



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