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

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

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



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