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

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

Change-Id: Ibef5acdb235ff1b0f30dd18e90330584ec037fa1