Merge "Fix wrong widget appearing in widget picker for tablet" into tm-qpr-dev am: 521e3748

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



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