[automerger] [RESTRICT AUTOMERGE] Make Lock task default behaviour consistent with Settings. am: fe9f143d2c am: 4938d3e518 am: 498d367b2c

Change-Id: I2f2c6d9634df88a1f7a8eae1b3a76dea8b6a1479