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

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

Change-Id: Iff0768cea130b699972a3a031c49cb0fba5cb9f0