Merge "Reattach LauncherAppWidgetHostView to its parent after canceling drag" into sc-dev am: 4176cb33bb am: 2fab58310a am: 97c60ae313

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

Change-Id: Ie27db3d61362f88c44d50c78a92edbd8f61530ae