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

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



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