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

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

Change-Id: I91c4de88902de11510d6ac79db5e9db61c4dc2ec