[automerger skipped] Merge "Remove unnecessary padding code" into tm-qpr-dev am: bd35c093 am: 34e58655 am: 4c759022 -s ours am: 4f7570ea -s ours am: d2e1349d -s ours

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

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



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