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

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

Change-Id: I48b858d068504918c4e051791ba1210260daf1f9