[automerger skipped] Merge "Refactor dispatching the focus event from...

[automerger skipped] Merge "Refactor dispatching the focus event from handleWindowFocusChanged" into tm-qpr-dev am: baa7f98f am: 67bf725f -s ours

am skip reason: Merged-In Ic2814d9665b8f293249de5fe2158f83af72517da with SHA-1 9cd2d6eb is already in history

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



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