Merge "Make non-blockable notification more robust" into rvc-d1-dev am: d8c6c356 am: 2af8e46e am: c14c5a93

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

Change-Id: Iec31b1053b5b49a9bd3b67f0b568ccfe3669cff7