Add separate AFV type for options popup dialog.

Now that we close all non rebind safe AFVs onResume, the options popup dialog is getting closed. This dialog is rebind safe, but currently using TYPE_OPTIONS_POPUP which isn't.

Test: Dialog stays open on activity recreate. Also ran affected tests.
Bug: 227142635
Change-Id: Ibbac925ce5dd2de5c7770cb8f5bd8c5e438449cf