Merge "Fix launcher activity leak in TouchInteractionService" into udc-dev am: 8f95307087

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

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