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

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

Change-Id: I13a46c9798b23bfaffed52610c3690814b6d2f4f