[automerger skipped] Remove unnecessary padding code am: f86a4892d5 -s ours am: faf00b0f65 -s ours am: 08be6c57a9 -s ours

am skip reason: Merged-In I720699093d5c5a584283e5b76851938f449ffa21 with SHA-1 3af48e4421 is already in history

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

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