Merge "-= src_available" am: c82603654a am: c84c245a91

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

Change-Id: I63e0d0e8dabdc1d2c2cf5d14929390070d839095