Merge "Fix NPE from using DeviceLockedInputConsumer after the surface has been...

Merge "Fix NPE from using DeviceLockedInputConsumer after the surface has been released" into tm-qpr-dev am: 8700307b am: d46450dd

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



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