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

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



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