Merge "Fix constant crash when setting MultiStateCallback.DEBUG_STATES=true" into tm-qpr-dev am: 8b3fda7eb8

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

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