[automerger skipped] Merge "Improve notification message" into tm-qpr-dev am:...

[automerger skipped] Merge "Improve notification message" into tm-qpr-dev am: f230391f am: 4e4a22b1 -s ours

am skip reason: Merged-In Ib01f94cc37279800d23c1bbe71a0abde51624dcd with SHA-1 6a0034a4 is already in history

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



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