Merge "Merge "Report WINDOW_FOCUS_GAIN_REPORT_ONLY when the served connection remains" into rvc-dev am: b1215125 am: c1f9c5e2" into rvc-d1-dev-plus-aosp am: 4148ba18

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

Change-Id: I63b67b950dec0cf9b0a49c502a93edfa2d93d9e4