[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 skip reason: subject contains skip directive

Change-Id: Iff8981642c8278a14827f946fc19efd8d6507e25