Merge "Ensure that input is disabled when locked out." into udc-dev am: 5b51213cbc am: ecfd6f1339

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

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