Merge "launcher: create more space options" into sc-v2-dev am: 9a6b20f0cb am: c760160125

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

Change-Id: I6113b9a28f0d33cdff55f3db584e853ed7f7a603