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

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

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



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