[automerger skipped] Remove unnecessary padding code am: b38e1e5a -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/+/23451525



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