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