[automerger skipped] Merge "Allows Launcher to recover gracefully into...

[automerger skipped] Merge "Allows Launcher to recover gracefully into OverviewSplitSelect state" into tm-qpr-dev am: e19aab90 am: ede7b650 -s ours

am skip reason: Merged-In Ie6123ef9c374be000268f82857b696c49213c541 with SHA-1 fbb19cf0 is already in history

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



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