[automerger skipped] Allow additional reason/surface combinations for cancel am: 4c39ad7c8f am: c57749a767 am: 75a9657762 -s ours am: e32e644121 -s ours
am skip reason: Merged-In I054969dc82da5277002049d063abdb044dcc811e with SHA-1 80ce161ff1 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24147764
Change-Id: I925bbd2fbd7bbf70a5040f06073a905e1e118d82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: