Merge "Properly cancel bugreport notification" into udc-qpr-dev am: 32c9f6da am: 25d0ee94

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



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