Merge "Make notif text more generic" into tm-qpr-dev am: cd8e27b3 am: 99209fd5

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



Change-Id: I540fb2d3a10ff586c2872774438ac3f0b0304e33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>