Merge "Update lockout state during auth session" into udc-dev am: 82a893fc0f am: e0a954d518

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

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