Merge "Play original haptic when feature flag is off. Rename feature flag"...

Merge "Play original haptic when feature flag is off. Rename feature flag" into tm-qpr-dev am: c1e12fc1 am: 3f5e40ea

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



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