Merge changes from topic "more-cancel-sc-qpr1-dev" into sc-qpr1-dev am:...

Merge changes from topic "more-cancel-sc-qpr1-dev" into sc-qpr1-dev am: 16a7d2e7 am: 02eb16d8 am: 1c6d4006

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

Change-Id: I815ef2d4fbcbdbedf5b0094ac8fe54875a41e98e