Merge "Fixes again outlineVariant on DynamicColor" into udc-dev am: d06a6b54 am: 4a1b627e

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



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