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

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



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