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

Merge "Ensure that input is disabled when locked out." into udc-dev am: 5b51213c am: ecfd6f13 am: e2354aa9 am: 4ed5b7ca

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



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