Merge changes from topic "notif-backport" into qt-dev am: a0f134bd11

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

Change-Id: I1229f9889329de39fff252dfcd35569d05c02d97