Merge "Enable NotificationMemoryMonitor dumps in bug reports" into tm-qpr-dev am: bbe23b9b

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



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