Merge changes from topic "more-cancel-sc-qpr1-dev" into sc-qpr1-dev am: 16a7d2e7bd am: c346dab881
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15727904 Change-Id: If24325d1911c0a8ee5f5bd323b42e13433317861
This commit is contained in: