am 8f3818c7: am 73efff7e: am 597f0d8a: am 04e99c51: am 2024fae2: (-s ours) DO NOT MERGE: camera2 CTS: Actually close Images in StillCaptureTest.

* commit '8f3818c74c948a741e023762c95cdd7ff1f8e146':