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

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

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