[automerger skipped] Merge "[DO NOT MERGE] Add missing outline_variant definition" into udc-mainline-prod am: 1834b187 -s ours

am skip reason: subject contains skip directive

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



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