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

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



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