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

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



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