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