Merge "Merge "Defuse notification race around app stops" into tm-dev am:...

Merge "Merge "Defuse notification race around app stops" into tm-dev am: 81ac10a9 am: 07d303a1" into tm-d1-dev-plus-aosp am: b10d6aa0 am: 63eb2327

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



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