Merge changes from topic "notif-backport" into qt-dev am: a0f134bd am: e9ffefbf am: 2ebc9c19

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

Change-Id: I53d77ecb7ec616891caf8dacec0d47e7290762f6