Merge "Fix wrong widget appearing in widget picker for tablet" into tm-qpr-dev...

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

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



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