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