Merge "Possibly fix the widget restoration bug" into udc-dev am: 7dabd57f am: 8fbd56b2

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



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