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

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

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