Merge "Add feature flag for dock setup" into tm-qpr-dev am: ea0c6c69

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



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