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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I41192fbb995c7780555d79846291d752130a83f8