Merge "Add separate AFV type for options popup dialog." into tm-dev am: d3d6f0d6

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



Change-Id: I33def1a40b11b9117cfbcbd43765447d115801bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>