Merge "Fix flaky corrupted padding tests" am: b54aebc2d8 am: 03a6cfdc15

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

Change-Id: I9e6d25ea0313c650c1c01bcb8254e97545ca5964