Merge "Potential fix for end callback not being run in 3-button" into udc-dev am: 606c4bfc

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



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