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

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

Change-Id: I1b4dc63320d0d89791046442472096a88c77c39b