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

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

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



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