Merge "Launch dock setup refactoring" into tm-qpr-dev am: 0e7375b1

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



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