Merge "Remove unnecessary padding code" into tm-qpr-dev am: bd35c093

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



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