Merge "Updates OptionsPopupView to allow non-resource strings/icons." into sc-dev am: dd2b8b6f2e

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

Change-Id: Ice9dfa8bada21f5248d22f1f5124a316b21122f0