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

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

Change-Id: I5e3f228fbc63f2af20460de8bca7efacc0701900