Merge "Fix AddWidgetTest & AddWidgetConfigTest" into sc-dev am: 8c792936fe

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

Change-Id: If591238d23610b07e57fcdbeaa541a5fead1a808