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

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

Change-Id: Ia284d780b468c152eb25905a8f47154956855fcc