[automerger skipped] Remove unnecessary padding code am: 3af48e44 -s ours...

[automerger skipped] Remove unnecessary padding code am: 3af48e44 -s ours am: 85fff460 -s ours am: 44e53eb8 -s ours am: 3a30ab66 -s ours am: a4ec189a -s ours am: 25e1d4f9 -s ours am: 02570e35 -s ours

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

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



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