Merge "Fix back gesture send to wrong focus window" into tm-dev am: 4bf81d57 am: dc621522

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



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