Merge "Cleanup flag for notification memory dumps in bug reports" into udc-dev...

Merge "Cleanup flag for notification memory dumps in bug reports" into udc-dev am: 0a7d7ba1 am: b0d1a5b9

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



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