Merge "Subtle improvements to notification logging." into tm-qpr-dev am: cdba1eefa6 am: 006c035fdf

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

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