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

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



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