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

am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1261605

Change-Id: I085a9c6fa0a904d7adb5201eeee21e91f5c56f3f