Merge "Fix NPE in FolderPagedView" into udc-dev am: 6597d5ec3c am: 0308e2506c

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

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