[automerger skipped] Merge "Fix padding in QSContainerImpl after re-inflation"...

[automerger skipped] Merge "Fix padding in QSContainerImpl after re-inflation" into tm-qpr-dev am: eeb0b9fa -s ours am: c380b40c -s ours

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

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



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