Merge "Fix unintended buffer canceling" am: ec9c339b3a

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2304872

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