[automerger skipped] Merge "Remove unnecessary padding code" into sc-qpr1-dev am: d149f77395 -s ours am: 10a35dda26 -s ours

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

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

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