Merge "Generalize the icon popup menu types." into sc-v2-dev am: e9bd364390

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

Change-Id: I4f16e17ee3c6e30fdeeac9f139756fa64fed4afa