Merge "Simplify dock setup state setting" into tm-qpr-dev am: baf76a11

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



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