Merge "Fix flaky corrupted padding tests" am: a33f46bc2a am: 61cf943208

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

Change-Id: Ia38b396861bbe402e726f8dec4f589520a01b90a