Merge "Account for the focused window before requesting input consumer focus"...

Merge "Account for the focused window before requesting input consumer focus" into sc-dev am: a0a4985d am: 03d643fa am: fee130dd

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

Change-Id: I690d2b5c350acddeb71ffc46a879bba778c2ce41