Merge "Allow additional reason/surface combinations for cancel" into...

Merge "Allow additional reason/surface combinations for cancel" into udc-qpr-dev am: dd9450a1 am: e3a65696

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



Change-Id: Ie352f71d29bd1e6e9721b21a5c67af59e4d80072
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>