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

Merge "[automerger skipped] Merge "Add missing @Test annotation to ignoresGesture_transitionInProgress" into tm-dev am: 308f9bfa am: 8efc556d am: f0712948 -s ours" into tm-qpr-dev-plus-aosp am: 798892ca -s ours

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

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



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