Reorder shape options, making sure that the default Circle is first.

Bug: 394885877
Flag: com.android.launcher3.enable_launcher_icon_shapes
Test: manually verifying options
Change-Id: I85e9b56f6ede3b5a367e6833fa51ce5962f42883
2 files changed