Merge "Remove unnecessary padding code" into tm-dev am: 98cc58c6

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



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