Merge "Respond to lockout reset requests from the HAL." into sc-dev am: 7f40c4b4 am: 7579f894 am: 42006c8f

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

Change-Id: I4ff37187801c945884898e4c7497dfe909c3847a