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

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



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