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

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

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



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