Merge "Enable ENABLE_DOCK_SETUP_V2 for Teamfood" into tm-qpr-dev am: dc94ae961f

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

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