Merge "Add additional cancel logs." into sc-dev am: 8fba2059e7 am: 8fbd66289a

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

Change-Id: I4fd7bfb4db2c9ceb6fa086bad7e50e899aa77339