[automerger skipped] Allow in-progress touch sessions to continue outside...

[automerger skipped] Allow in-progress touch sessions to continue outside resume. am: f296aa6c am: a1aa72a3 -s ours

am skip reason: Merged-In Ibac6e94bcf6b8c4d751349edfbcb04b2fe53285a with SHA-1 5d0b6e3b is already in history

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



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