Merge "Adjust QS top padding" into tm-dev am: a63651d4 am: 36d41f50 am: 4944bd15 am: 16792ec6

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



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