Merge "Remove focus if no window and current focus is valid" into tm-dev am: f13bfa6c

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



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