Merge "Add new dock setup states to state enum" into tm-qpr-dev am: 3bfcd979 am: 9f4420c4

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



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