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: 1f2f81ad am: caaad8b7

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



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