[automerger] [RESTRICT AUTOMERGE] Make Lock task default behaviour consistent with Settings. am: fe9f143d2c am: 4938d3e518 am: 498d367b2c am: d6f4a3f2bc skipped: ad38008f58 am: 970863ea62
am: 9707affaa8

Change-Id: Iba3263f17bb98cbad6239b04d6f3d7667312118a