Merge changes from topic "hidl-clear-buf" am: c86759a16b

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1506836

Change-Id: I77b25a52e35e49cb25f2b4673a6e8c02b1f52a88