Merge "[automerger skipped] Merge "Remove unnecessary padding code" into...

Merge "[automerger skipped] Merge "Remove unnecessary padding code" into tm-dev am: 98cc58c6 am: 4156025e -s ours am: bf693beb -s ours" into udc-dev-plus-aosp am: 9a405b35 -s ours am: 9467594a -s ours am: dc6853a9 -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/+/23439342



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