[automerger skipped] [automerger] [RESTRICT AUTOMERGE] Make Lock task default...

[automerger skipped] [automerger] [RESTRICT AUTOMERGE] Make Lock task default behaviour consistent with Settings. am: fe9f143d am: 4938d3e5 am: 498d367b am: d6f4a3f2 skipped: ad38008f am: 970863ea am: 9707affa am: 906080bd -s ours am: 77d21995 -s ours am: b3878dc1
am: 333e6437 -s ours
am skip reason: subject contains skip directive

Change-Id: I535fdc20b916ad3655e054d1fe7577f6a930c1db