Merge "[automerger skipped] Merge "Remove unnecessary padding code" into tm-qpr-dev am: bd35c093 am: 34e58655 am: ae0a180a -s ours am: b60cc0c1 -s ours" into udc-qpr-dev-plus-aosp am: 3278db81 -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/+/23438365



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