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

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

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



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