Put shape options for picker behind it's own flag

Test: presubmit && locally verified switching flags
Flag: com.android.launcher3.enable_launcher_icon_shapes
Bug: 376293447

Change-Id: If2fb8b6dcdcfcaf6ba0f6f1acef45d5bf2b327cb