Merge "Add instruction to put the device into test harness to error message"...

Merge "Add instruction to put the device into test harness to error message" into tm-qpr-dev am: a3e61240 am: f9d6efc4

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21222958



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