Merge "Remove unnecessary padding code" into tm-qpr-dev am: bd35c09327 am: 34e58655af

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

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