Merge "Check FLAG_CLEAR_BUF behavior." am: c3aa2ad415 am: fc214bc68a

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1061ae895a7546329877f625ed1516188393ed3a