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

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



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