[automerger skipped] Merge "Remove unnecessary padding code" into sc-qpr1-dev...

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