[automerger skipped] Fix padding in QSContainerImpl after re-inflation am: 6677f7974f -s ours am: 45bb12a603 -s ours

am skip reason: Merged-In Ic3d97e05d99148e71b9dd64f8f56c20fc68193c9 with SHA-1 59d959f200 is already in history

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

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