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

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

Change-Id: Ia63a7c09e7ef5f2dbab228bbbe02429151de57f2