[automerger skipped] Merge "Remove unnecessary padding code" into sc-v2-dev am: a29b5c30fc -s ours am: 0403986095 -s ours

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

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

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