[automerger skipped] Merge "Add logging for swipe and timeout" into...

[automerger skipped] Merge "Add logging for swipe and timeout" into rvc-qpr-dev am: ee4b2ad5 am: e9b87cfa -s ours

am skip reason: Change-Id Ie2205d6c369576f1f83996b2f96d040ddd328e83 with SHA-1 a0546c79 is in history

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

Change-Id: Ie9bb08ffe9a0d7a4ea4d82c4c8b63c052a3cd69b