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

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



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