Merge "Ensure mConsumer isn't set to null in reset()." into sc-dev am: 82fc5c83a5 am: f0e1e8bf00

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

Change-Id: Icf283921b956e9822ecd7b3fa26755bc809b25da