Merge "Making sure QS are visible when expanding shade with heads-up...

Merge "Making sure QS are visible when expanding shade with heads-up notification" into tm-qpr-dev am: dae823a3

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



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