Merge "Make notif text more generic" into tm-qpr-dev am: cd8e27b311

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

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