Merge "Revert "Revert "Add TaskbarModeSwitchRule to test both transient/persistent taskbar.""" into tm-qpr-dev am: 87ccecb6fc am: 8c49ddde2f

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

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