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

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



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