[automerger skipped] Merge "Add missing @Test annotation to...

[automerger skipped] Merge "Add missing @Test annotation to ignoresGesture_transitionInProgress" into tm-dev am: 308f9bfa am: 9dd284ba am: 4ffa0e72 am: df9354d4 -s ours

am skip reason: Merged-In I1738b40c8df1c9af7bb0e63586cb2e70b3c9e8ca with SHA-1 a1e7ce93 is already in history

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



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