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

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



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