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