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

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

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



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