Merge "Fixed NSSL top padding being set below QQS minimum height" into tm-qpr-dev am: c2336369 am: 9c49e47f am: 46f1d1b8 am: 8b4a8cc4

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



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