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

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

Change-Id: I7f5cdb7f63f68456ed9c05d239ac06a2a6bc6171