[automerger skipped] Allow additional reason/surface combinations for cancel...

[automerger skipped] Allow additional reason/surface combinations for cancel am: 4c39ad7c am: 3568caef -s ours

am skip reason: Merged-In I054969dc82da5277002049d063abdb044dcc811e with SHA-1 80ce161f is already in history

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



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