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: If0a4cd0d930f9ee232ecc530c87e7f52d7b891bb