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

[automerger skipped] Remove unnecessary padding code am: 548b0a18 -s ours am: 6d3171ba -s ours am: 51ec76a7 -s ours am: 1fa1bd46 -s ours am: 47333977 -s ours am: 35225eea -s ours am: e15ffc07 -s ours am: 1fae4625 -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: Id2c00b0df4093a01504fa69f5af2a3ed99d412d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>