Merge "When dismissing lockscreen, wait up to 1.5 seconds for it to work." into tm-dev am: 1442d3449b am: f8d183fb53
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17050579 Change-Id: Ie31933d37ec28842ccbd7ef399189c8ec6757757
This commit is contained in: