[automerger skipped] Remove unnecessary padding code am: 548b0a18 -s ours

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

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



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