Merge "Close stream at end of OpenAnOpenedStreamsTest" am: edd9dea02c

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

Change-Id: Iabf80e68439e25a1098f9eb8120af87f29cba350