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

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

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