Merge "Revert "Keeps the served view of the window when focus to the ne..."" into rvc-dev am: e974c347 am: 8fafb19c

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

Change-Id: I39c275b4b6976f8b57ede34e2ea2b0f3c1ed4693