[automerger skipped] Merge "Remove unnecessary padding code" into udc-dev am: 55913c51 -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: I7c8c3f322f2c54289a834710c1c17753e904866e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>