Allow additional reason/surface combinations for cancel am: 4c39ad7c am: c57749a7

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



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