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: 7f0991c9 am: 29d5900f

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



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