[automerger skipped] Merge "Remove unnecessary padding code" into tm-qpr-dev am: bd35c09327 am: 34e58655af am: 4c759022ee -s ours
am skip reason: Merged-In I720699093d5c5a584283e5b76851938f449ffa21 with SHA-1 49a08b8642 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23438365
Change-Id: I39ccb391c6e8f2de569cde156cf178c7a232096a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: