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

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

Change-Id: If8fd08a764a3242464fa93cd7ab04f9895a4f979