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

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

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