Merge "Part 2 of removing shade blinking while moving heads-up notification"...

Merge "Part 2 of removing shade blinking while moving heads-up notification" into tm-qpr-dev am: debeb035 am: fc70a971

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



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