Merge "Add a button for floating tasks to taskbar (behind a flag)" into...

Merge "Add a button for floating tasks to taskbar (behind a flag)" into tm-qpr-dev am: 13b7e00f am: 6d37424c

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



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