Merge "KeyguardViewMediatorTest - Flaky test fix" into sc-qpr1-dev am: 2ac8e5991c am: 0683612e8f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15542972 Change-Id: I16c4167a3f73567d3e1e49e1dde86ec60d9003c6
This commit is contained in: