Merge "ResetLockoutClients cancel preceding clients." into tm-dev am: fa8e422f am: 818a03bc am: d7154541

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



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