[automerger] [RESTRICT AUTOMERGE] Make Lock task default behaviour consistent with Settings. am: fe9f143d am: 4938d3e5 Change-Id: I6a2f5b46c70720cedf377f107b77d590b297aea4