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

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

Change-Id: I39ce59aa9c773742e8b2b2f899459e1c81c321df