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

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