Merge "Fix padding in QSContainerImpl after re-inflation" into udc-dev am: 3ae3ca1a am: fb63f207 am: f41f026b am: 2454e2ac

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



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