Merge "Fixed NSSL top padding being set below QQS minimum height" into tm-qpr-dev am: c2336369

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



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