Merge "Add additional cancel logs." into sc-dev am: 8fba2059 am: e729718d am: e8c2a53c

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

Change-Id: I926430ceccf8be8117ba685c74d880b4de348af3