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

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



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