[automerger skipped] Merge "Remove unnecessary padding code" into sc-v2-dev am: a29b5c30 -s ours

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

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



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