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

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