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

[automerger skipped] Remove unnecessary padding code am: f86a4892 -s ours am: faf00b0f -s ours am: 08be6c57 -s ours am: 8b706fd9 -s ours

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

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



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