Merge "Fix persistence of long tag notifications." into tm-qpr-dev am: 7edfc225 am: f75449a2

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



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