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

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



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