Merge "Report WINDOW_FOCUS_GAIN_REPORT_ONLY when the served connection remains" into rvc-dev am: b1215125 am: 4f93e9c8 am: d55ebecd

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

Change-Id: Ic3005913395e602859c8e55f42f09b5018ac90cc