Merge "Fix unintended buffer canceling" am: ec9c339b am: 932910e2 am:...

Merge "Fix unintended buffer canceling" am: ec9c339b am: 932910e2 am: 9afefc81 am: fa2dafec am: 41d7c307

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



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