Merge "Adjust QS top padding" into tm-dev am: a63651d4 am: d75dc473

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



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