Merge "Notifies correct device state callback on cancellation" into sc-v2-dev...

Merge "Notifies correct device state callback on cancellation" into sc-v2-dev am: 34873949 am: bbf1f135

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

Change-Id: Ie52f5b5595007e4d5a22424a269db215e98838ea