Merge "Make sure desktop task view is only used in proto 2" into tm-qpr-dev am: b219e31477 am: aacd5d330b

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

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