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

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

Change-Id: I85ce0ef755e33fa8d83339ac91291b7b0239960e