Merge "CtsWindowManagerDeviceTestCases...

Merge "CtsWindowManagerDeviceTestCases android.server.wm.KeyguardTests#testResumeDismissKeyguardActivityFromBackground --fail" into tm-qpr-dev-plus-aosp am: 88f99f05

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



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