[automerger skipped] Merge "CtsWindowManagerDeviceTestCases...

[automerger skipped] Merge "CtsWindowManagerDeviceTestCases android.server.wm.KeyguardTests#testResumeDismissKeyguardActivityFromBackground --fail" am: d0790027 am: d6775e2d am: 6fc25007 am: 2dbefde9 -s ours

am skip reason: Merged-In Ia0a52477fc62b403c678301c8e49561d3b23bedf with SHA-1 c582b3c2 is already in history

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



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