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

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

Change-Id: I87c20dcbb5701c15236a4b49d46f7339699c8ac0