Merge "Fix the weirdly broken code in NotificationWakeUpCoordinator" into tm-qpr-dev am: b0479a1031 am: b4f33c845e

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

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