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

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



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