Merge "ResetLockoutClients cancel preceding clients." into tm-dev am: fa8e422ffa am: 3057d5fbd7 am: d4dc3b91d0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18309972 Change-Id: I2a56670b490ed4072dfedd1aeabb7871c0cf4095 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: