am c25d5460: Merge "Fix jank: Don\'t write lockout deadline if not needed" into mnc-dr-dev

* commit 'c25d546050423845c42a5e8cc8e356caa1f4f71a':
  Fix jank: Don't write lockout deadline if not needed