Merge "Add Flag for overlapping Heads-up Notification bug fixing" into udc-qpr-dev am: b6a6a939

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



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