Merge "Respond to lockout reset requests from the HAL." into sc-dev am: 7f40c4b4ef am: c4d0afc24c

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

Change-Id: Id0d5acd30a3b51b041ff045d96400d08a338697f