Merge "Fix spring not springing when unstashing." into tm-qpr-dev am: cbe578b2 am: 0f436116

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



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