Merge "Close stream at end of OpenAnOpenedStreamsTest" am: edd9dea02c am: c127d95b71 am: 9069693ab0

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

Change-Id: I66da2f861e081e40c18d4671708809f3037523f9