Merge "Fix unintended buffer canceling" am: ec9c339b3a am: 932910e25b am: 9afefc8186 am: fa2dafec92

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

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