Merge "Fix padding in QSContainerImpl after re-inflation" into udc-dev am:...

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

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



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