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

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

Change-Id: I60aeeebfe0c1598817cf608135e0ae9f9808d324