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

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

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