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

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



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