Merge "Add log to NoMan for canceled cancels" into rvc-qpr-dev am: 8092c9b37d am: 723a7028c7

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

Change-Id: I96d709e238a6c446f95c21fc466097ec9a7996ea