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

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

Change-Id: I55fa48a6e83270bd614b080b0c9606111de50d51