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

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

Change-Id: Ie567df953f00690a9408c354014e63fc979ed10f