Merge "Re-enable AddConfigWidgetTest" into tm-qpr-dev am: 2f4a1b9980 am: a64545be52

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

Change-Id: I2b5d0a71be067b460aa7aebf546e38130a5d1a47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>