[automerger skipped] RESTRICT AUTOMERGE Relax timeout for all operations am: fcba82540c -s ours

am skip reason: subject contains skip directive

Change-Id: I5a22c4050ac8a87c22f7546cc9aad349e05565d9