Merge "Move numAllAppsColumns to displayOptions" into sc-dev am: 06452a427d

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

Change-Id: I4f1f4e4bd0b5923191850525c15d116551f66f98