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

[automerger skipped] Merge "Remove unnecessary padding code" into tm-dev am: 98cc58c6 am: d8c66671 -s ours am: d9d062d7 -s ours am: 94e4aeef -s ours

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

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



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