[automerge] Add separate AFV type for options popup dialog. 2p: 7ef4fe42cb

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

Bug: 227142635
Change-Id: I05aa82f92df0aa437332cfcfae6f04d35a155ac1