Merge "Allow overriding getOptionsPopup test method." into sc-v2-dev am: bc1b36344f am: 7e5e234668

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

Change-Id: I59d603e5413c0a2b1f528fbfcef4d041c519502a