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

Merge "Defuse notification race around app stops" into tm-dev am: 81ac10a9 am: 07d303a1 am: d9fa2029 am: 13f2b7d7

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



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