Merge "Fixes again outlineVariant on DynamicColor" into udc-dev am: d06a6b54 am: 9b07ebca am: 1362e714

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



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