Merge "Disable flaky recovery test" am: 3ca4bf9b8c am: 5188d3c59d

Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1999432

Change-Id: Ie7ee867a82fb58e2af84e6a09784102edd6f45d0