Merge "Beef up logging in and near tryRemoveNotification" into udc-qpr-dev am: 5b9dba8d

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



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