Merge "Use launcher surface when removing launch target" into sc-dev am: e55878cedf am: b546a2d8f8

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

Change-Id: I72ff7a5095fb142bab5664e7003b4429e34e4445