Merge "Using DiffUtil for calculating widget diff instead of a custom implementation" into tm-qpr-dev am: cc10ed5532 am: 75db2c1f59

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

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