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