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

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

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