[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: e2e00307 -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: I031d380dc9e0f9c4aa92c0dbcbbd0a3e3bffb6f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>