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: c346dab8 am: 5b7c3622

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

Change-Id: Iec3ab382049cabd480882c416de1c3cac752f31d