Merge "Merge "Make DWB CCT changes follow a step function" into udc-dev am:...

Merge "Merge "Make DWB CCT changes follow a step function" into udc-dev am: 0cdca7eb am: a8cb78a9" into udc-qpr-dev am: 99f0f495

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



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