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

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

Change-Id: I5634da8649178166d17a63d04787e5079df83dc0