Merge "Update lockout state during auth session" into udc-dev am: 82a893fc am: 0eade5a4

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



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