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

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

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