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