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

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

Change-Id: I0626052684fc975e8a29cacde7eb6c548bf2c759