Merge "Fix pagination broken when opening folder after restart bug." into tm-qpr-dev am: 8cb0383e

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



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