[automerger skipped] Merge "Remove unnecessary padding code" into tm-dev am:...

[automerger skipped] Merge "Remove unnecessary padding code" into tm-dev am: 98cc58c6 am: 4156025e -s ours am: bf693beb -s ours am: 81396f41 -s ours

am skip reason: Merged-In I720699093d5c5a584283e5b76851938f449ffa21 with SHA-1 b38e1e5a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23439342



Change-Id: Ib531240aa06d6a78b2a0a24f34becc375ed4c7f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>