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

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

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