Merge "Fixing deadlock when surface creation is waiting on surface destroy" into sc-dev am: 9ccd3c5e12

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

Change-Id: I2ec923a31315a65deb148de13b0baf13ed75ae8d