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

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



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