Merge "Fixes again outlineVariant on DynamicColor" into udc-dev am: d06a6b54c2

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

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