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: I15f666fc477a6b869d53ec6970987d6a08100f68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>