Merge "Revert change in qs padding in portrait" into tm-qpr-dev am: be8eeb52

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



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