[automerger skipped] Merge "Remove unnecessary padding code" into tm-qpr-dev am: bd35c093 am: 34e58655 am: 6ad4c441 -s ours

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

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



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