[automerger skipped] Merge "Fix back gesture send to wrong focus window" into...

[automerger skipped] Merge "Fix back gesture send to wrong focus window" into tm-dev am: 4bf81d57 am: d965e675 am: cb01df44 -s ours am: 45a78c78 -s ours

am skip reason: Merged-In I81c4f02d43299c03f94dc295bb23ba80d46bded8 with SHA-1 7d870f9e is already in history

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



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