[automerger skipped] Remove unnecessary padding code am: 548b0a1838 -s ours am: 6d3171ba45 -s ours am: 51ec76a7ba -s ours am: 1fa1bd46c4 -s ours

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

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

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