Merge "Enable dock setup recovery flag" into tm-qpr-dev am: 854fe441 am: c83b882f

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



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