Merge "Make non-blockable notification more robust" into rvc-d1-dev am: d8c6c356c3 am: 2af8e46e72

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

Change-Id: I5e25b80fe338313cd7135a1cb12d3f840b616e74