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

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

Change-Id: Ie50a00970832fc03691a66907534ccc0fc71208f