Merge changes from topic "notif-backport" into qt-dev am: a0f134bd11 am: e9ffefbf4d am: 2ebc9c19e3 am: 5fafb28cb1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13453266 Change-Id: Id3de7accc135452dc79c935526720ad134a4b5df
This commit is contained in: