Merge "Ensure TouchSessions are always removed." into tm-qpr-dev am: 5a384f0e am: ccd60177

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21051850



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