[automerger skipped] Merge "Remove unnecessary padding code" into sc-v2-dev am: a29b5c30fc -s ours am: 0403986095 -s ours am: 936da94372 -s ours am: 17a7932bf3 -s ours am: f21bc06af3 -s ours am: 0518618f7c -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: I0bbf25afc8eab583419169b298c89a6114d12530
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: