Merge "Fix bug where folder with 1 icon can exist" into 24D1-dev am: 74fd4908

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



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